Manual merge.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 26 Jul 2005 15:16:12 +0000 (15:16 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 26 Jul 2005 15:16:12 +0000 (15:16 +0000)

Trivial merge